From 2599ca4d9f97b55d2ce3c5787e694e29e5949c4d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 21 Dec 2015 07:46:37 -0500
Subject: [PATCH] Adwaita: Attempt a fixing split headers

Remove decorations from headerbars which are wrapped in some
other containers (like boxes, or paneds), to prevent double
decorations in those cases.
---
 gtk/theme/Adwaita/_common.scss           |   2 +-
 gtk/theme/Adwaita/gtk-contained-dark.css | 214 +++++++++++------------
 gtk/theme/Adwaita/gtk-contained.css      | 214 +++++++++++------------
 3 files changed, 215 insertions(+), 215 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 636998dd04..48539e1486 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1081,7 +1081,7 @@ searchbar,
  ***************/
 
 .titlebar,
-headerbar {
+window > headerbar {
   padding: 6px;
   border-width: 0 0 1px;
   border-style: solid;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 2ede396873..03e25bc339 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -94,7 +94,7 @@ label:insensitive {
     color: #5d6767; }
 
 .dim-label, label.separator, .titlebar .subtitle,
-headerbar .subtitle {
+window > headerbar .subtitle {
   opacity: 0.55;
   text-shadow: none; }
 
@@ -1283,10 +1283,10 @@ button.color, headerbar button.color.titlebutton,
     *:selected *:link:active, *:selected button:active:link, *:selected button:active:visited {
       color: #d3dfeb; }
   *:link:backdrop, button:backdrop:link, button:backdrop:visited, *:link:backdrop:hover, button:backdrop:hover:link, button:backdrop:hover:visited, *:link:backdrop:hover:selected, button:backdrop:hover:selected:link, button:backdrop:hover:selected:visited, .titlebar.selection-mode .subtitle:backdrop:hover:link,
-  headerbar.selection-mode .subtitle:backdrop:hover:link {
+  window > headerbar.selection-mode .subtitle:backdrop:hover:link {
     color: #215d9c; }
   *:link:selected, button:selected:link, button:selected:visited, .titlebar.selection-mode .subtitle:link,
-  headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, *:selected button:visited {
+  window > headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, *:selected button:visited {
     color: #d3dfeb; }
 
 button:link, headerbar button.titlebutton:link,
@@ -1600,7 +1600,7 @@ searchbar,
  * Header bars *
  ***************/
 .titlebar,
-headerbar {
+window > headerbar {
   padding: 6px;
   border-width: 0 0 1px;
   border-style: solid;
@@ -1610,47 +1610,47 @@ headerbar {
   background-image: linear-gradient(to top, #2a2f2f, #2f3434 2px, #323737 3px);
   box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); }
   .titlebar:backdrop,
-  headerbar:backdrop {
+  window > headerbar:backdrop {
     border-color: #1f2222;
     background-color: #393f3f;
     background-image: none;
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); }
   .titlebar .title,
-  headerbar .title {
+  window > headerbar .title {
     font-weight: bold;
     padding-left: 12px;
     padding-right: 12px; }
   .titlebar .subtitle,
-  headerbar .subtitle {
+  window > headerbar .subtitle {
     font-size: smaller;
     padding-left: 12px;
     padding-right: 12px; }
   .titlebar .header-bar-separator, .titlebar > GtkBox > separator.vertical,
-  headerbar .header-bar-separator,
-  headerbar > GtkBox > separator.vertical {
+  window > headerbar .header-bar-separator,
+  window > headerbar > GtkBox > separator.vertical {
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
     border-image: linear-gradient(to bottom, rgba(28, 31, 31, 0), #1c1f1f 30%, #1c1f1f 70%, rgba(28, 31, 31, 0) 100%) 0 1/0 1px stretch; }
     .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > separator.vertical:backdrop,
-    headerbar .header-bar-separator:backdrop,
-    headerbar > GtkBox > separator.vertical:backdrop {
+    window > headerbar .header-bar-separator:backdrop,
+    window > headerbar > GtkBox > separator.vertical:backdrop {
       border-image: linear-gradient(to bottom, rgba(31, 34, 34, 0.5)) 0 1/1px 1px; }
   .titlebar.selection-mode,
-  headerbar.selection-mode {
+  window > headerbar.selection-mode {
     color: #ffffff;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #0f2b48;
     background-image: linear-gradient(to bottom, #256ab1, #215d9c);
     box-shadow: inset 0 -1px #1b4c7f, inset 0 1px rgba(40, 98, 159, 0.535); }
     .titlebar.selection-mode:backdrop,
-    headerbar.selection-mode:backdrop {
+    window > headerbar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #215d9c);
       box-shadow: inset 0 1px rgba(44, 100, 160, 0.442); }
     .titlebar.selection-mode button,
-    headerbar.selection-mode button,
-    headerbar.selection-mode .titlebar button.titlebutton,
-    .titlebar headerbar.selection-mode button.titlebutton {
+    window > headerbar.selection-mode button,
+    window > headerbar.selection-mode .titlebar button.titlebutton,
+    .titlebar window > headerbar.selection-mode button.titlebutton {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #0b1e33;
@@ -1660,9 +1660,9 @@ headerbar {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0); }
       .titlebar.selection-mode button.flat, .titlebar.selection-mode button.sidebar-button,
       .titlebar.selection-mode button.titlebutton,
-      headerbar.selection-mode button.flat,
-      headerbar.selection-mode button.sidebar-button,
-      headerbar.selection-mode button.titlebutton {
+      window > headerbar.selection-mode button.flat,
+      window > headerbar.selection-mode button.sidebar-button,
+      window > headerbar.selection-mode button.titlebutton {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
@@ -1670,7 +1670,7 @@ headerbar {
         text-shadow: none;
         -gtk-icon-shadow: none; }
       .titlebar.selection-mode button:hover,
-      headerbar.selection-mode button:hover {
+      window > headerbar.selection-mode button:hover {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #0b1e33;
@@ -1685,8 +1685,8 @@ headerbar {
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.65553);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0); }
       .titlebar.selection-mode button:active, .titlebar.selection-mode button:checked,
-      headerbar.selection-mode button:active,
-      headerbar.selection-mode button:checked {
+      window > headerbar.selection-mode button:active,
+      window > headerbar.selection-mode button:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #0b1e33;
@@ -1696,10 +1696,10 @@ headerbar {
         box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(40, 98, 159, 0); }
       .titlebar.selection-mode button:backdrop, .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode button.sidebar-button:backdrop,
       .titlebar.selection-mode button.titlebutton:backdrop,
-      headerbar.selection-mode button:backdrop,
-      headerbar.selection-mode button.flat:backdrop,
-      headerbar.selection-mode button.sidebar-button:backdrop,
-      headerbar.selection-mode button.titlebutton:backdrop {
+      window > headerbar.selection-mode button:backdrop,
+      window > headerbar.selection-mode button.flat:backdrop,
+      window > headerbar.selection-mode button.sidebar-button:backdrop,
+      window > headerbar.selection-mode button.titlebutton:backdrop {
         color: #d3dfeb;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #215d9c);
@@ -1711,14 +1711,14 @@ headerbar {
         .titlebar.selection-mode button:backdrop:active, .titlebar.selection-mode button:backdrop:checked, .titlebar.selection-mode button.flat:backdrop:active, .titlebar.selection-mode button.sidebar-button:backdrop:active,
         .titlebar.selection-mode button.titlebutton:backdrop:active, .titlebar.selection-mode button.flat:backdrop:checked, .titlebar.selection-mode button.sidebar-button:backdrop:checked,
         .titlebar.selection-mode button.titlebutton:backdrop:checked,
-        headerbar.selection-mode button:backdrop:active,
-        headerbar.selection-mode button:backdrop:checked,
-        headerbar.selection-mode button.flat:backdrop:active,
-        headerbar.selection-mode button.sidebar-button:backdrop:active,
-        headerbar.selection-mode button.titlebutton:backdrop:active,
-        headerbar.selection-mode button.flat:backdrop:checked,
-        headerbar.selection-mode button.sidebar-button:backdrop:checked,
-        headerbar.selection-mode button.titlebutton:backdrop:checked {
+        window > headerbar.selection-mode button:backdrop:active,
+        window > headerbar.selection-mode button:backdrop:checked,
+        window > headerbar.selection-mode button.flat:backdrop:active,
+        window > headerbar.selection-mode button.sidebar-button:backdrop:active,
+        window > headerbar.selection-mode button.titlebutton:backdrop:active,
+        window > headerbar.selection-mode button.flat:backdrop:checked,
+        window > headerbar.selection-mode button.sidebar-button:backdrop:checked,
+        window > headerbar.selection-mode button.titlebutton:backdrop:checked {
           color: #d1dae3;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #184472);
@@ -1726,10 +1726,10 @@ headerbar {
           border-color: #0f2b48; }
         .titlebar.selection-mode button:backdrop:insensitive, .titlebar.selection-mode button.flat:backdrop:insensitive, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive,
-        headerbar.selection-mode button:backdrop:insensitive,
-        headerbar.selection-mode button.flat:backdrop:insensitive,
-        headerbar.selection-mode button.sidebar-button:backdrop:insensitive,
-        headerbar.selection-mode button.titlebutton:backdrop:insensitive {
+        window > headerbar.selection-mode button:backdrop:insensitive,
+        window > headerbar.selection-mode button.flat:backdrop:insensitive,
+        window > headerbar.selection-mode button.sidebar-button:backdrop:insensitive,
+        window > headerbar.selection-mode button.titlebutton:backdrop:insensitive {
           color: #6f91b4;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #22558b);
@@ -1739,24 +1739,24 @@ headerbar {
           border-color: #0f2b48; }
           .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode button.flat:backdrop:insensitive > .label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive > .label,
-          headerbar.selection-mode button:backdrop:insensitive > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label,
-          headerbar.selection-mode button.flat:backdrop:insensitive > .label,
-          headerbar.selection-mode button.sidebar-button:backdrop:insensitive > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:insensitive > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
+          window > headerbar.selection-mode button:backdrop:insensitive > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label,
+          window > headerbar.selection-mode button.flat:backdrop:insensitive > .label,
+          window > headerbar.selection-mode button.sidebar-button:backdrop:insensitive > .label,
+          window > headerbar.selection-mode button.titlebutton:backdrop:insensitive > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode button:backdrop:insensitive:active, .titlebar.selection-mode button:backdrop:insensitive:checked, .titlebar.selection-mode button.flat:backdrop:insensitive:active, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:active,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active, .titlebar.selection-mode button.flat:backdrop:insensitive:checked, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:checked,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked,
-        headerbar.selection-mode button:backdrop:insensitive:active,
-        headerbar.selection-mode button:backdrop:insensitive:checked,
-        headerbar.selection-mode button.flat:backdrop:insensitive:active,
-        headerbar.selection-mode button.sidebar-button:backdrop:insensitive:active,
-        headerbar.selection-mode button.titlebutton:backdrop:insensitive:active,
-        headerbar.selection-mode button.flat:backdrop:insensitive:checked,
-        headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked,
-        headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked {
+        window > headerbar.selection-mode button:backdrop:insensitive:active,
+        window > headerbar.selection-mode button:backdrop:insensitive:checked,
+        window > headerbar.selection-mode button.flat:backdrop:insensitive:active,
+        window > headerbar.selection-mode button.sidebar-button:backdrop:insensitive:active,
+        window > headerbar.selection-mode button.titlebutton:backdrop:insensitive:active,
+        window > headerbar.selection-mode button.flat:backdrop:insensitive:checked,
+        window > headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked,
+        window > headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked {
           color: #6c88a7;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #1d4877);
@@ -1765,32 +1765,32 @@ headerbar {
           .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:active > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode button:backdrop:insensitive:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
-          headerbar.selection-mode button:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode button.flat:backdrop:insensitive:active > .label,
-          headerbar.selection-mode button.sidebar-button:backdrop:insensitive:active > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:insensitive:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
-          headerbar.selection-mode button.flat:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
+          window > headerbar.selection-mode button:backdrop:insensitive:active > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
+          window > headerbar.selection-mode button:backdrop:insensitive:checked > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
+          window > headerbar.selection-mode button.flat:backdrop:insensitive:active > .label,
+          window > headerbar.selection-mode button.sidebar-button:backdrop:insensitive:active > .label,
+          window > headerbar.selection-mode button.titlebutton:backdrop:insensitive:active > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
+          window > headerbar.selection-mode button.flat:backdrop:insensitive:checked > .label,
+          window > headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked > .label,
+          window > headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode button.sidebar-button:backdrop,
       .titlebar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode button.flat:insensitive, .titlebar.selection-mode button.sidebar-button:insensitive,
       .titlebar.selection-mode button.titlebutton:insensitive, .titlebar.selection-mode button.flat:insensitive:backdrop, .titlebar.selection-mode button.sidebar-button:insensitive:backdrop,
       .titlebar.selection-mode button.titlebutton:insensitive:backdrop,
-      headerbar.selection-mode button.flat:backdrop,
-      headerbar.selection-mode button.sidebar-button:backdrop,
-      headerbar.selection-mode button.titlebutton:backdrop,
-      headerbar.selection-mode button.flat:insensitive,
-      headerbar.selection-mode button.sidebar-button:insensitive,
-      headerbar.selection-mode button.titlebutton:insensitive,
-      headerbar.selection-mode button.flat:insensitive:backdrop,
-      headerbar.selection-mode button.sidebar-button:insensitive:backdrop,
-      headerbar.selection-mode button.titlebutton:insensitive:backdrop {
+      window > headerbar.selection-mode button.flat:backdrop,
+      window > headerbar.selection-mode button.sidebar-button:backdrop,
+      window > headerbar.selection-mode button.titlebutton:backdrop,
+      window > headerbar.selection-mode button.flat:insensitive,
+      window > headerbar.selection-mode button.sidebar-button:insensitive,
+      window > headerbar.selection-mode button.titlebutton:insensitive,
+      window > headerbar.selection-mode button.flat:insensitive:backdrop,
+      window > headerbar.selection-mode button.sidebar-button:insensitive:backdrop,
+      window > headerbar.selection-mode button.titlebutton:insensitive:backdrop {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
@@ -1798,7 +1798,7 @@ headerbar {
         text-shadow: none;
         -gtk-icon-shadow: none; }
       .titlebar.selection-mode button:insensitive,
-      headerbar.selection-mode button:insensitive {
+      window > headerbar.selection-mode button:insensitive {
         color: #91aac5;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #22558b);
@@ -1806,24 +1806,24 @@ headerbar {
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0); }
         .titlebar.selection-mode button:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:insensitive > .label,
-        headerbar.selection-mode button:insensitive > .label,
-        headerbar.selection-mode .titlebar button.titlebutton:insensitive > .label {
+        window > headerbar.selection-mode button:insensitive > .label,
+        window > headerbar.selection-mode .titlebar button.titlebutton:insensitive > .label {
           color: inherit; }
         .titlebar.selection-mode button:insensitive:active, .titlebar.selection-mode button:insensitive:checked,
-        headerbar.selection-mode button:insensitive:active,
-        headerbar.selection-mode button:insensitive:checked {
+        window > headerbar.selection-mode button:insensitive:active,
+        window > headerbar.selection-mode button:insensitive:checked {
           color: #a5b6c9;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #1b4470, #1d4877);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0); }
           .titlebar.selection-mode button:insensitive:active > .label, .titlebar.selection-mode headerbar button.titlebutton:insensitive:active > .label, .titlebar.selection-mode button:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:insensitive:checked > .label,
-          headerbar.selection-mode button:insensitive:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:insensitive:active > .label,
-          headerbar.selection-mode button:insensitive:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:insensitive:checked > .label {
+          window > headerbar.selection-mode button:insensitive:active > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:insensitive:active > .label,
+          window > headerbar.selection-mode button:insensitive:checked > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.suggested-action,
-      headerbar.selection-mode button.suggested-action {
+      window > headerbar.selection-mode button.suggested-action {
         color: #eeeeec;
         outline-color: rgba(238, 238, 236, 0.3);
         border-color: #1c1f1f;
@@ -1833,7 +1833,7 @@ headerbar {
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0);
         border-color: #0f2b48; }
         .titlebar.selection-mode button.suggested-action:hover,
-        headerbar.selection-mode button.suggested-action:hover {
+        window > headerbar.selection-mode button.suggested-action:hover {
           color: #eeeeec;
           outline-color: rgba(238, 238, 236, 0.3);
           border-color: #1c1f1f;
@@ -1849,7 +1849,7 @@ headerbar {
           box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0);
           border-color: #0f2b48; }
         .titlebar.selection-mode button.suggested-action:active,
-        headerbar.selection-mode button.suggested-action:active {
+        window > headerbar.selection-mode button.suggested-action:active {
           color: #eeeeec;
           outline-color: rgba(238, 238, 236, 0.3);
           border-color: #1c1f1f;
@@ -1859,7 +1859,7 @@ headerbar {
           box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(40, 98, 159, 0);
           border-color: #0f2b48; }
         .titlebar.selection-mode button.suggested-action:insensitive,
-        headerbar.selection-mode button.suggested-action:insensitive {
+        window > headerbar.selection-mode button.suggested-action:insensitive {
           color: #949796;
           border-color: #1c1f1f;
           background-image: linear-gradient(to bottom, #333636);
@@ -1868,11 +1868,11 @@ headerbar {
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
           border-color: #0f2b48; }
           .titlebar.selection-mode button.suggested-action:insensitive > .label, .titlebar.selection-mode headerbar button.suggested-action.titlebutton:insensitive > .label,
-          headerbar.selection-mode button.suggested-action:insensitive > .label,
-          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:insensitive > .label {
+          window > headerbar.selection-mode button.suggested-action:insensitive > .label,
+          window > headerbar.selection-mode .titlebar button.suggested-action.titlebutton:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode button.suggested-action:backdrop,
-        headerbar.selection-mode button.suggested-action:backdrop {
+        window > headerbar.selection-mode button.suggested-action:backdrop {
           color: #949796;
           border-color: #1f2222;
           background-image: linear-gradient(to bottom, #393f3f);
@@ -1881,7 +1881,7 @@ headerbar {
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
           border-color: #0f2b48; }
         .titlebar.selection-mode button.suggested-action:backdrop:insensitive,
-        headerbar.selection-mode button.suggested-action:backdrop:insensitive {
+        window > headerbar.selection-mode button.suggested-action:backdrop:insensitive {
           color: #5d6767;
           border-color: #1f2222;
           background-image: linear-gradient(to bottom, #333636);
@@ -1890,41 +1890,41 @@ headerbar {
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
           border-color: #0f2b48; }
           .titlebar.selection-mode button.suggested-action:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
-          headerbar.selection-mode button.suggested-action:backdrop:insensitive > .label,
-          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
+          window > headerbar.selection-mode button.suggested-action:backdrop:insensitive > .label,
+          window > headerbar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
             color: inherit; }
     .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
-    headerbar.selection-mode .selection-menu,
-    headerbar.selection-mode .titlebar.selection-mode .selection-menu:backdrop,
-    .titlebar.selection-mode headerbar.selection-mode .selection-menu:backdrop,
-    headerbar.selection-mode .selection-menu:backdrop {
+    window > headerbar.selection-mode .selection-menu,
+    window > headerbar.selection-mode .titlebar.selection-mode .selection-menu:backdrop,
+    .titlebar.selection-mode window > headerbar.selection-mode .selection-menu:backdrop,
+    window > headerbar.selection-mode .selection-menu:backdrop {
       border-color: rgba(33, 93, 156, 0);
       background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0));
       box-shadow: none;
       padding-left: 10px;
       padding-right: 10px; }
       .titlebar.selection-mode .selection-menu GtkArrow, .titlebar.selection-mode .selection-menu:backdrop GtkArrow,
-      headerbar.selection-mode .selection-menu GtkArrow,
-      headerbar.selection-mode .titlebar.selection-mode .selection-menu:backdrop GtkArrow,
-      .titlebar.selection-mode headerbar.selection-mode .selection-menu:backdrop GtkArrow,
-      headerbar.selection-mode .selection-menu:backdrop GtkArrow {
+      window > headerbar.selection-mode .selection-menu GtkArrow,
+      window > headerbar.selection-mode .titlebar.selection-mode .selection-menu:backdrop GtkArrow,
+      .titlebar.selection-mode window > headerbar.selection-mode .selection-menu:backdrop GtkArrow,
+      window > headerbar.selection-mode .selection-menu:backdrop GtkArrow {
         -GtkArrow-arrow-scaling: 1; }
       .titlebar.selection-mode .selection-menu .arrow,
-      headerbar.selection-mode .selection-menu .arrow {
+      window > headerbar.selection-mode .selection-menu .arrow {
         -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
         color: rgba(255, 255, 255, 0.5);
         -gtk-icon-shadow: none; }
   .tiled .titlebar, .maximized .titlebar, .tiled
-  headerbar, .maximized
-  headerbar {
+  window > headerbar, .maximized
+  window > headerbar {
     border-radius: 0; }
   .titlebar.default-decoration,
-  headerbar.default-decoration {
+  window > headerbar.default-decoration {
     padding: 4px; }
     .titlebar.default-decoration button,
-    headerbar.default-decoration button,
-    headerbar.default-decoration .titlebar button.titlebutton,
-    .titlebar headerbar.default-decoration button.titlebutton {
+    window > headerbar.default-decoration button,
+    window > headerbar.default-decoration .titlebar button.titlebutton,
+    .titlebar window > headerbar.default-decoration button.titlebutton {
       padding: 5px; }
 
 /************
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 7d2c6054ac..dc4b0ceac1 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -94,7 +94,7 @@ label:insensitive {
     color: #c3c3c0; }
 
 .dim-label, label.separator, .titlebar .subtitle,
-headerbar .subtitle {
+window > headerbar .subtitle {
   opacity: 0.55;
   text-shadow: none; }
 
@@ -1283,10 +1283,10 @@ button.color, headerbar button.color.titlebutton,
     *:selected *:link:active, *:selected button:active:link, *:selected button:active:visited {
       color: #dbe9f7; }
   *:link:backdrop, button:backdrop:link, button:backdrop:visited, *:link:backdrop:hover, button:backdrop:hover:link, button:backdrop:hover:visited, *:link:backdrop:hover:selected, button:backdrop:hover:selected:link, button:backdrop:hover:selected:visited, .titlebar.selection-mode .subtitle:backdrop:hover:link,
-  headerbar.selection-mode .subtitle:backdrop:hover:link {
+  window > headerbar.selection-mode .subtitle:backdrop:hover:link {
     color: #4a90d9; }
   *:link:selected, button:selected:link, button:selected:visited, .titlebar.selection-mode .subtitle:link,
-  headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, *:selected button:visited {
+  window > headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, *:selected button:visited {
     color: #dbe9f7; }
 
 button:link, headerbar button.titlebutton:link,
@@ -1600,7 +1600,7 @@ searchbar,
  * Header bars *
  ***************/
 .titlebar,
-headerbar {
+window > headerbar {
   padding: 6px;
   border-width: 0 0 1px;
   border-style: solid;
@@ -1610,47 +1610,47 @@ headerbar {
   background-image: linear-gradient(to top, #d4d4d2, #efefef 2px, #f4f4f4 3px);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); }
   .titlebar:backdrop,
-  headerbar:backdrop {
+  window > headerbar:backdrop {
     border-color: #a5a5a1;
     background-color: #e8e8e7;
     background-image: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); }
   .titlebar .title,
-  headerbar .title {
+  window > headerbar .title {
     font-weight: bold;
     padding-left: 12px;
     padding-right: 12px; }
   .titlebar .subtitle,
-  headerbar .subtitle {
+  window > headerbar .subtitle {
     font-size: smaller;
     padding-left: 12px;
     padding-right: 12px; }
   .titlebar .header-bar-separator, .titlebar > GtkBox > separator.vertical,
-  headerbar .header-bar-separator,
-  headerbar > GtkBox > separator.vertical {
+  window > headerbar .header-bar-separator,
+  window > headerbar > GtkBox > separator.vertical {
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
     border-image: linear-gradient(to bottom, rgba(157, 157, 153, 0), #9d9d99 30%, #9d9d99 70%, rgba(157, 157, 153, 0) 100%) 0 1/0 1px stretch; }
     .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > separator.vertical:backdrop,
-    headerbar .header-bar-separator:backdrop,
-    headerbar > GtkBox > separator.vertical:backdrop {
+    window > headerbar .header-bar-separator:backdrop,
+    window > headerbar > GtkBox > separator.vertical:backdrop {
       border-image: linear-gradient(to bottom, rgba(165, 165, 161, 0.5)) 0 1/1px 1px; }
   .titlebar.selection-mode,
-  headerbar.selection-mode {
+  window > headerbar.selection-mode {
     color: #ffffff;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #184472;
     background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9);
     box-shadow: inset 0 -1px #3975b5, inset 0 1px rgba(146, 188, 232, 0.9); }
     .titlebar.selection-mode:backdrop,
-    headerbar.selection-mode:backdrop {
+    window > headerbar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #4a90d9);
       box-shadow: inset 0 1px rgba(165, 200, 236, 0.88); }
     .titlebar.selection-mode button,
-    headerbar.selection-mode button,
-    headerbar.selection-mode .titlebar button.titlebutton,
-    .titlebar headerbar.selection-mode button.titlebutton {
+    window > headerbar.selection-mode button,
+    window > headerbar.selection-mode .titlebar button.titlebutton,
+    .titlebar window > headerbar.selection-mode button.titlebutton {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #1c5187;
@@ -1660,9 +1660,9 @@ headerbar {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.4), 0 1px rgba(146, 188, 232, 0); }
       .titlebar.selection-mode button.flat, .titlebar.selection-mode button.sidebar-button,
       .titlebar.selection-mode button.titlebutton,
-      headerbar.selection-mode button.flat,
-      headerbar.selection-mode button.sidebar-button,
-      headerbar.selection-mode button.titlebutton {
+      window > headerbar.selection-mode button.flat,
+      window > headerbar.selection-mode button.sidebar-button,
+      window > headerbar.selection-mode button.titlebutton {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
@@ -1670,7 +1670,7 @@ headerbar {
         text-shadow: none;
         -gtk-icon-shadow: none; }
       .titlebar.selection-mode button:hover,
-      headerbar.selection-mode button:hover {
+      window > headerbar.selection-mode button:hover {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #1c5187;
@@ -1685,8 +1685,8 @@ headerbar {
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.49553);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.4), 0 1px rgba(146, 188, 232, 0); }
       .titlebar.selection-mode button:active, .titlebar.selection-mode button:checked,
-      headerbar.selection-mode button:active,
-      headerbar.selection-mode button:checked {
+      window > headerbar.selection-mode button:active,
+      window > headerbar.selection-mode button:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #1c5187;
@@ -1696,10 +1696,10 @@ headerbar {
         box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(146, 188, 232, 0); }
       .titlebar.selection-mode button:backdrop, .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode button.sidebar-button:backdrop,
       .titlebar.selection-mode button.titlebutton:backdrop,
-      headerbar.selection-mode button:backdrop,
-      headerbar.selection-mode button.flat:backdrop,
-      headerbar.selection-mode button.sidebar-button:backdrop,
-      headerbar.selection-mode button.titlebutton:backdrop {
+      window > headerbar.selection-mode button:backdrop,
+      window > headerbar.selection-mode button.flat:backdrop,
+      window > headerbar.selection-mode button.sidebar-button:backdrop,
+      window > headerbar.selection-mode button.titlebutton:backdrop {
         color: #dbe9f7;
         border-color: #4a90d9;
         background-image: linear-gradient(to bottom, #4a90d9);
@@ -1711,14 +1711,14 @@ headerbar {
         .titlebar.selection-mode button:backdrop:active, .titlebar.selection-mode button:backdrop:checked, .titlebar.selection-mode button.flat:backdrop:active, .titlebar.selection-mode button.sidebar-button:backdrop:active,
         .titlebar.selection-mode button.titlebutton:backdrop:active, .titlebar.selection-mode button.flat:backdrop:checked, .titlebar.selection-mode button.sidebar-button:backdrop:checked,
         .titlebar.selection-mode button.titlebutton:backdrop:checked,
-        headerbar.selection-mode button:backdrop:active,
-        headerbar.selection-mode button:backdrop:checked,
-        headerbar.selection-mode button.flat:backdrop:active,
-        headerbar.selection-mode button.sidebar-button:backdrop:active,
-        headerbar.selection-mode button.titlebutton:backdrop:active,
-        headerbar.selection-mode button.flat:backdrop:checked,
-        headerbar.selection-mode button.sidebar-button:backdrop:checked,
-        headerbar.selection-mode button.titlebutton:backdrop:checked {
+        window > headerbar.selection-mode button:backdrop:active,
+        window > headerbar.selection-mode button:backdrop:checked,
+        window > headerbar.selection-mode button.flat:backdrop:active,
+        window > headerbar.selection-mode button.sidebar-button:backdrop:active,
+        window > headerbar.selection-mode button.titlebutton:backdrop:active,
+        window > headerbar.selection-mode button.flat:backdrop:checked,
+        window > headerbar.selection-mode button.sidebar-button:backdrop:checked,
+        window > headerbar.selection-mode button.titlebutton:backdrop:checked {
           color: #d4e4f4;
           border-color: #2a76c6;
           background-image: linear-gradient(to bottom, #2a76c6);
@@ -1726,10 +1726,10 @@ headerbar {
           border-color: #184472; }
         .titlebar.selection-mode button:backdrop:insensitive, .titlebar.selection-mode button.flat:backdrop:insensitive, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive,
-        headerbar.selection-mode button:backdrop:insensitive,
-        headerbar.selection-mode button.flat:backdrop:insensitive,
-        headerbar.selection-mode button.sidebar-button:backdrop:insensitive,
-        headerbar.selection-mode button.titlebutton:backdrop:insensitive {
+        window > headerbar.selection-mode button:backdrop:insensitive,
+        window > headerbar.selection-mode button.flat:backdrop:insensitive,
+        window > headerbar.selection-mode button.sidebar-button:backdrop:insensitive,
+        window > headerbar.selection-mode button.titlebutton:backdrop:insensitive {
           color: #9bc2ea;
           border-color: #65a1df;
           background-image: linear-gradient(to bottom, #65a1df);
@@ -1739,24 +1739,24 @@ headerbar {
           border-color: #184472; }
           .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode button.flat:backdrop:insensitive > .label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive > .label,
-          headerbar.selection-mode button:backdrop:insensitive > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label,
-          headerbar.selection-mode button.flat:backdrop:insensitive > .label,
-          headerbar.selection-mode button.sidebar-button:backdrop:insensitive > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:insensitive > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
+          window > headerbar.selection-mode button:backdrop:insensitive > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label,
+          window > headerbar.selection-mode button.flat:backdrop:insensitive > .label,
+          window > headerbar.selection-mode button.sidebar-button:backdrop:insensitive > .label,
+          window > headerbar.selection-mode button.titlebutton:backdrop:insensitive > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode button:backdrop:insensitive:active, .titlebar.selection-mode button:backdrop:insensitive:checked, .titlebar.selection-mode button.flat:backdrop:insensitive:active, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:active,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active, .titlebar.selection-mode button.flat:backdrop:insensitive:checked, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:checked,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked,
-        headerbar.selection-mode button:backdrop:insensitive:active,
-        headerbar.selection-mode button:backdrop:insensitive:checked,
-        headerbar.selection-mode button.flat:backdrop:insensitive:active,
-        headerbar.selection-mode button.sidebar-button:backdrop:insensitive:active,
-        headerbar.selection-mode button.titlebutton:backdrop:insensitive:active,
-        headerbar.selection-mode button.flat:backdrop:insensitive:checked,
-        headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked,
-        headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked {
+        window > headerbar.selection-mode button:backdrop:insensitive:active,
+        window > headerbar.selection-mode button:backdrop:insensitive:checked,
+        window > headerbar.selection-mode button.flat:backdrop:insensitive:active,
+        window > headerbar.selection-mode button.sidebar-button:backdrop:insensitive:active,
+        window > headerbar.selection-mode button.titlebutton:backdrop:insensitive:active,
+        window > headerbar.selection-mode button.flat:backdrop:insensitive:checked,
+        window > headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked,
+        window > headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked {
           color: #8db9e8;
           border-color: #5094db;
           background-image: linear-gradient(to bottom, #5094db);
@@ -1765,32 +1765,32 @@ headerbar {
           .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:active > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode button:backdrop:insensitive:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
-          headerbar.selection-mode button:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode button.flat:backdrop:insensitive:active > .label,
-          headerbar.selection-mode button.sidebar-button:backdrop:insensitive:active > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:insensitive:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
-          headerbar.selection-mode button.flat:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
+          window > headerbar.selection-mode button:backdrop:insensitive:active > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
+          window > headerbar.selection-mode button:backdrop:insensitive:checked > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
+          window > headerbar.selection-mode button.flat:backdrop:insensitive:active > .label,
+          window > headerbar.selection-mode button.sidebar-button:backdrop:insensitive:active > .label,
+          window > headerbar.selection-mode button.titlebutton:backdrop:insensitive:active > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
+          window > headerbar.selection-mode button.flat:backdrop:insensitive:checked > .label,
+          window > headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked > .label,
+          window > headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode button.sidebar-button:backdrop,
       .titlebar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode button.flat:insensitive, .titlebar.selection-mode button.sidebar-button:insensitive,
       .titlebar.selection-mode button.titlebutton:insensitive, .titlebar.selection-mode button.flat:insensitive:backdrop, .titlebar.selection-mode button.sidebar-button:insensitive:backdrop,
       .titlebar.selection-mode button.titlebutton:insensitive:backdrop,
-      headerbar.selection-mode button.flat:backdrop,
-      headerbar.selection-mode button.sidebar-button:backdrop,
-      headerbar.selection-mode button.titlebutton:backdrop,
-      headerbar.selection-mode button.flat:insensitive,
-      headerbar.selection-mode button.sidebar-button:insensitive,
-      headerbar.selection-mode button.titlebutton:insensitive,
-      headerbar.selection-mode button.flat:insensitive:backdrop,
-      headerbar.selection-mode button.sidebar-button:insensitive:backdrop,
-      headerbar.selection-mode button.titlebutton:insensitive:backdrop {
+      window > headerbar.selection-mode button.flat:backdrop,
+      window > headerbar.selection-mode button.sidebar-button:backdrop,
+      window > headerbar.selection-mode button.titlebutton:backdrop,
+      window > headerbar.selection-mode button.flat:insensitive,
+      window > headerbar.selection-mode button.sidebar-button:insensitive,
+      window > headerbar.selection-mode button.titlebutton:insensitive,
+      window > headerbar.selection-mode button.flat:insensitive:backdrop,
+      window > headerbar.selection-mode button.sidebar-button:insensitive:backdrop,
+      window > headerbar.selection-mode button.titlebutton:insensitive:backdrop {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
@@ -1798,7 +1798,7 @@ headerbar {
         text-shadow: none;
         -gtk-icon-shadow: none; }
       .titlebar.selection-mode button:insensitive,
-      headerbar.selection-mode button:insensitive {
+      window > headerbar.selection-mode button:insensitive {
         color: #b2d0ef;
         border-color: #1c5187;
         background-image: linear-gradient(to bottom, #65a1df);
@@ -1806,24 +1806,24 @@ headerbar {
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0); }
         .titlebar.selection-mode button:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:insensitive > .label,
-        headerbar.selection-mode button:insensitive > .label,
-        headerbar.selection-mode .titlebar button.titlebutton:insensitive > .label {
+        window > headerbar.selection-mode button:insensitive > .label,
+        window > headerbar.selection-mode .titlebar button.titlebutton:insensitive > .label {
           color: inherit; }
         .titlebar.selection-mode button:insensitive:active, .titlebar.selection-mode button:insensitive:checked,
-        headerbar.selection-mode button:insensitive:active,
-        headerbar.selection-mode button:insensitive:checked {
+        window > headerbar.selection-mode button:insensitive:active,
+        window > headerbar.selection-mode button:insensitive:checked {
           color: #b9d4f1;
           border-color: #1c5187;
           background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0); }
           .titlebar.selection-mode button:insensitive:active > .label, .titlebar.selection-mode headerbar button.titlebutton:insensitive:active > .label, .titlebar.selection-mode button:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:insensitive:checked > .label,
-          headerbar.selection-mode button:insensitive:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:insensitive:active > .label,
-          headerbar.selection-mode button:insensitive:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:insensitive:checked > .label {
+          window > headerbar.selection-mode button:insensitive:active > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:insensitive:active > .label,
+          window > headerbar.selection-mode button:insensitive:checked > .label,
+          window > headerbar.selection-mode .titlebar button.titlebutton:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.suggested-action,
-      headerbar.selection-mode button.suggested-action {
+      window > headerbar.selection-mode button.suggested-action {
         color: #2e3436;
         outline-color: rgba(46, 52, 54, 0.3);
         border-color: #9d9d99;
@@ -1833,7 +1833,7 @@ headerbar {
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.8), 0 1px rgba(146, 188, 232, 0);
         border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:hover,
-        headerbar.selection-mode button.suggested-action:hover {
+        window > headerbar.selection-mode button.suggested-action:hover {
           color: #2e3436;
           outline-color: rgba(46, 52, 54, 0.3);
           border-color: #9d9d99;
@@ -1849,7 +1849,7 @@ headerbar {
           box-shadow: inset 0 1px white, 0 1px rgba(146, 188, 232, 0);
           border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:active,
-        headerbar.selection-mode button.suggested-action:active {
+        window > headerbar.selection-mode button.suggested-action:active {
           color: #2e3436;
           outline-color: rgba(46, 52, 54, 0.3);
           border-color: #9d9d99;
@@ -1859,7 +1859,7 @@ headerbar {
           box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(146, 188, 232, 0);
           border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:insensitive,
-        headerbar.selection-mode button.suggested-action:insensitive {
+        window > headerbar.selection-mode button.suggested-action:insensitive {
           color: #8b8e8f;
           border-color: #9d9d99;
           background-image: linear-gradient(to bottom, #f1f1f1);
@@ -1868,11 +1868,11 @@ headerbar {
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0);
           border-color: #184472; }
           .titlebar.selection-mode button.suggested-action:insensitive > .label, .titlebar.selection-mode headerbar button.suggested-action.titlebutton:insensitive > .label,
-          headerbar.selection-mode button.suggested-action:insensitive > .label,
-          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:insensitive > .label {
+          window > headerbar.selection-mode button.suggested-action:insensitive > .label,
+          window > headerbar.selection-mode .titlebar button.suggested-action.titlebutton:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode button.suggested-action:backdrop,
-        headerbar.selection-mode button.suggested-action:backdrop {
+        window > headerbar.selection-mode button.suggested-action:backdrop {
           color: #8b8e8f;
           border-color: #a5a5a1;
           background-image: linear-gradient(to bottom, #e8e8e7);
@@ -1881,7 +1881,7 @@ headerbar {
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0);
           border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:backdrop:insensitive,
-        headerbar.selection-mode button.suggested-action:backdrop:insensitive {
+        window > headerbar.selection-mode button.suggested-action:backdrop:insensitive {
           color: #c3c3c0;
           border-color: #a5a5a1;
           background-image: linear-gradient(to bottom, #f1f1f1);
@@ -1890,41 +1890,41 @@ headerbar {
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0);
           border-color: #184472; }
           .titlebar.selection-mode button.suggested-action:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
-          headerbar.selection-mode button.suggested-action:backdrop:insensitive > .label,
-          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
+          window > headerbar.selection-mode button.suggested-action:backdrop:insensitive > .label,
+          window > headerbar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
             color: inherit; }
     .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
-    headerbar.selection-mode .selection-menu,
-    headerbar.selection-mode .titlebar.selection-mode .selection-menu:backdrop,
-    .titlebar.selection-mode headerbar.selection-mode .selection-menu:backdrop,
-    headerbar.selection-mode .selection-menu:backdrop {
+    window > headerbar.selection-mode .selection-menu,
+    window > headerbar.selection-mode .titlebar.selection-mode .selection-menu:backdrop,
+    .titlebar.selection-mode window > headerbar.selection-mode .selection-menu:backdrop,
+    window > headerbar.selection-mode .selection-menu:backdrop {
       border-color: rgba(74, 144, 217, 0);
       background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0));
       box-shadow: none;
       padding-left: 10px;
       padding-right: 10px; }
       .titlebar.selection-mode .selection-menu GtkArrow, .titlebar.selection-mode .selection-menu:backdrop GtkArrow,
-      headerbar.selection-mode .selection-menu GtkArrow,
-      headerbar.selection-mode .titlebar.selection-mode .selection-menu:backdrop GtkArrow,
-      .titlebar.selection-mode headerbar.selection-mode .selection-menu:backdrop GtkArrow,
-      headerbar.selection-mode .selection-menu:backdrop GtkArrow {
+      window > headerbar.selection-mode .selection-menu GtkArrow,
+      window > headerbar.selection-mode .titlebar.selection-mode .selection-menu:backdrop GtkArrow,
+      .titlebar.selection-mode window > headerbar.selection-mode .selection-menu:backdrop GtkArrow,
+      window > headerbar.selection-mode .selection-menu:backdrop GtkArrow {
         -GtkArrow-arrow-scaling: 1; }
       .titlebar.selection-mode .selection-menu .arrow,
-      headerbar.selection-mode .selection-menu .arrow {
+      window > headerbar.selection-mode .selection-menu .arrow {
         -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
         color: rgba(255, 255, 255, 0.5);
         -gtk-icon-shadow: none; }
   .tiled .titlebar, .maximized .titlebar, .tiled
-  headerbar, .maximized
-  headerbar {
+  window > headerbar, .maximized
+  window > headerbar {
     border-radius: 0; }
   .titlebar.default-decoration,
-  headerbar.default-decoration {
+  window > headerbar.default-decoration {
     padding: 4px; }
     .titlebar.default-decoration button,
-    headerbar.default-decoration button,
-    headerbar.default-decoration .titlebar button.titlebutton,
-    .titlebar headerbar.default-decoration button.titlebutton {
+    window > headerbar.default-decoration button,
+    window > headerbar.default-decoration .titlebar button.titlebutton,
+    .titlebar window > headerbar.default-decoration button.titlebutton {
       padding: 5px; }
 
 /************
-- 
2.30.2